The following commit has been merged in the master branch:
commit 980acc863efb573d4e6e223c6b88bfcfd8b9f1bc
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Sat Nov 10 12:55:27 2012 +0200
main.glade: remove AZAmendment2 traces
diff --git a/data/main.glade b/data/main.glade
index 6d1b93d..c433714 100644
--- a/data/main.glade
+++ b/data/main.glade
@@ -1473,18 +1473,6 @@ rm */*/*/.*.{psd,mc}</property>
<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>
@@ -5401,7 +5389,7 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
- <property name="n_rows">7</property>
+ <property name="n_rows">6</property>
<property name="n_columns">4</property>
<property name="row_spacing">5</property>
<child>
@@ -5414,8 +5402,8 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="right_attach">4</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_padding">5</property>
</packing>
</child>
@@ -5491,8 +5479,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_SHRINK</property>
</packing>
@@ -5511,8 +5499,8 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_SHRINK</property>
</packing>
@@ -5531,8 +5519,8 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_SHRINK</property>
</packing>
@@ -5556,8 +5544,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_SHRINK</property>
</packing>
@@ -5573,8 +5561,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
</packing>
</child>
<child>
@@ -5618,38 +5606,6 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="bottom_attach">3</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="eCtlParamAZAmendment2">
- <property name="label" translatable="yes">A_Z Amendment 2</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>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="lCtlParamAZAmendment2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">4</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
</object>
</child>
</object>
@@ -6746,6 +6702,12 @@ dragging individual signals with <i>Alt</i>.</small></property
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child>
--
Sleep experiment manager