The following commit has been merged in the master branch:
commit a392484ad58897305620313e0d8ca814882d6af6
Author: Andrei Zavada <[email protected]>
Date: Sun Oct 14 01:51:51 2012 +0300
tweak layout of SF artifact detection dialog
diff --git a/data/sf.glade b/data/sf.glade
index 79710b0..09ff12d 100644
--- a/data/sf.glade
+++ b/data/sf.glade
@@ -2832,15 +2832,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>
@@ -2849,15 +2849,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>
@@ -3092,18 +3092,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>
@@ -3113,17 +3112,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>
@@ -4443,6 +4443,7 @@ skew: 𝑔(𝑢) = 𝑢2</property>
<object class="GtkGrid" id="cSFADWhenEstimateEOff">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<child>
<object class="GtkSpinButton" id="eSFADEValue">
<property name="visible">True</property>
@@ -4764,25 +4765,16 @@ skew: 𝑔(𝑢) = 𝑢2</property>
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
+ <object class="GtkSeparator" id="separator2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">12</property>
+ <property name="width">7</property>
+ <property name="height">1</property>
+ </packing>
</child>
<child>
<placeholder/>
@@ -5168,13 +5160,6 @@ skew: 𝑔(𝑢) = 𝑢2</property>
<widget name="cSFScoringModeContainer"/>
</widgets>
</object>
- <object class="GtkSizeGroup" id="sizegroup2">
- <property name="mode">both</property>
- <widgets>
- <widget name="cSFADWhenEstimateEOff"/>
- <widget name="cSFADWhenEstimateEOn"/>
- </widgets>
- </object>
<object class="GtkSizeGroup" id="sizegroup3">
<widgets>
<widget name="label37"/>
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
