Permalink
Browse files

Merge branch 'master' of github.com:hmmr/aghermann

  • Loading branch information...
2 parents 6594ddf + ee3e482 commit 18361ef0ef37cf51710ef1bd1f4ddd084ce3d56e @hmmr committed May 25, 2012
@@ -2717,6 +2717,18 @@ GPL-2+</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>
@@ -4620,39 +4632,9 @@ EEG microcontinuity algorithm as published &lt;a href="http://code.google.com/p/
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
- <property name="n_rows">6</property>
+ <property name="n_rows">7</property>
<property name="n_columns">2</property>
<child>
- <object class="GtkColorButton" id="bColourPowerSF">
- <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">PSD line</property>
- <property name="color">#0f0f6262a9a9</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label97">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">PSD Line</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="label98">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -4662,8 +4644,8 @@ EEG microcontinuity algorithm as published &lt;a href="http://code.google.com/p/
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
@@ -4678,8 +4660,8 @@ EEG microcontinuity algorithm as published &lt;a href="http://code.google.com/p/
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
@@ -4694,8 +4676,8 @@ EEG microcontinuity algorithm as published &lt;a href="http://code.google.com/p/
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
@@ -4712,8 +4694,8 @@ EEG microcontinuity algorithm as published &lt;a href="http://code.google.com/p/
<property name="color">#108f6e4d178b</property>
</object>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -4730,8 +4712,8 @@ EEG microcontinuity algorithm as published &lt;a href="http://code.google.com/p/
<property name="color">#fdefffffdbfc</property>
</object>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -4749,8 +4731,8 @@ EEG microcontinuity algorithm as published &lt;a href="http://code.google.com/p/
<property name="color">#db3c1ab939cf</property>
</object>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -4768,8 +4750,8 @@ EEG microcontinuity algorithm as published &lt;a href="http://code.google.com/p/
<property name="color">#3da9846af6c2</property>
</object>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -4784,8 +4766,8 @@ EEG microcontinuity algorithm as published &lt;a href="http://code.google.com/p/
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
@@ -4803,8 +4785,8 @@ EEG microcontinuity algorithm as published &lt;a href="http://code.google.com/p/
<property name="color">#6b57e4d75206</property>
</object>
<packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -4819,12 +4801,76 @@ EEG microcontinuity algorithm as published &lt;a href="http://code.google.com/p/
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="x_padding">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkColorButton" id="bColourProfilePsdSF">
+ <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">EEG PSD</property>
+ <property name="color">#0f0f6262a9a9</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label97">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">PSD</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">µContinuity</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="x_padding">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkColorButton" id="bColourProfileMcSF">
+ <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">EEG Microcontinuity</property>
+ <property name="color">#e73f8bfb0315</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="position">1</property>
@@ -7408,6 +7454,12 @@ EEG microcontinuity algorithm as published &lt;a href="http://code.google.com/p/
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child>
Oops, something went wrong. Retry.

0 comments on commit 18361ef

Please sign in to comment.