[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461
Andrei Zavada
johnhommer at gmail.com
Fri Nov 16 00:50:48 UTC 2012
The following commit has been merged in the master branch:
commit 94ca3a31c8a003a801e3dfd66ddff597360e128e
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Wed Nov 7 01:43:15 2012 +0200
lose "Author & License" tab on About dialog
diff --git a/data/dialogs.glade b/data/dialogs.glade
index 7233a69..f6b4d3f 100644
--- a/data/dialogs.glade
+++ b/data/dialogs.glade
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="jBatchSetupRangeWidth">
+ <property name="lower">0.25</property>
+ <property name="upper">10</property>
+ <property name="value">1</property>
+ <property name="step_increment">0.25</property>
+ <property name="page_increment">1</property>
+ </object>
<object class="GtkAdjustment" id="jBatchSetupRangeFrom">
<property name="upper">80</property>
<property name="value">1.5</property>
@@ -21,13 +28,6 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkAdjustment" id="jBatchSetupRangeWidth">
- <property name="lower">0.25</property>
- <property name="upper">10</property>
- <property name="value">1</property>
- <property name="step_increment">0.25</property>
- <property name="page_increment">1</property>
- </object>
<object class="GtkAdjustment" id="jDAMsmtPPH">
<property name="lower">5</property>
<property name="upper">300</property>
@@ -375,11 +375,13 @@
<property name="yalign">0</property>
<property name="xpad">10</property>
<property name="ypad">10</property>
- <property name="label" translatable="yes">A sleep-research experiment management program,
-with scoring facility, power spectrum analysis
-and visualization, and Process S simulation
-following <a href="http://dx.doi.org/10.1016/0361-9230(93)90016-5">Achermann et al, 1993</a> (in <a href="http://dissertations.ub.rug.nl/faculties/science/2007/a.zavada/">this interpretation</a>).</property>
+ <property name="label" translatable="yes"><big>A sleep-research experiment manager with capable scoring facility; PSD and EEG Microcontinuity sleep profiles; artifact detection; and Process S simulation following <a href="http://dx.doi.org/10.1016/0361-9230(93)90016-5">Achermann et al, 1993</a> (in <a href="http://dissertations.ub.rug.nl/faculties/science/2007/a.zavada/">this interpretation</a>).</big>
+
+Aghermann is developed by Andrei Zavada <a href="mailto:johnhommer at gmail.com">johnhommer at gmail.com</a> and distributed under GPL-2+.
+
+With bug reports, either send yours to <a href="mailto:aghermann-users at lists.sourceforge.net">aghermann-users at lists.sourceforge.net</a>, or open an issue on <a href="http://github.com/hmmr/aghermann/issues">http://github.com/hmmr/aghermann/issues</a>.</property>
<property name="use_markup">True</property>
+ <property name="wrap">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -406,41 +408,6 @@ following <a href="http://dx.doi.org/10.1016/0361-9230(93)90016-5">Acherma
</packing>
</child>
<child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">10</property>
- <property name="ypad">10</property>
- <property name="label" translatable="yes">Aghermann is developed by Andrei Zavada <a href="mailto:johnhommer at gmail.com">johnhommer at gmail.com</a> and distributed under GPL-2+.
-
-With bug reports, either send yours to <a href="mailto:aghermann-users at lists.sourceforge.net">aghermann-users at lists.sourceforge.net</a>, or open an issue on <a href="http://github.com/hmmr/aghermann/issues">http://github.com/hmmr/aghermann/issues</a>.</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">10</property>
- <property name="margin_right">10</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Author & License</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -471,7 +438,7 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
</child>
</object>
<packing>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child type="tab">
@@ -487,7 +454,7 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<property name="use_markup">True</property>
</object>
<packing>
- <property name="position">2</property>
+ <property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
diff --git a/src/ui/mw/mw.cc b/src/ui/mw/mw.cc
index ef930b0..9603885 100644
--- a/src/ui/mw/mw.cc
+++ b/src/ui/mw/mw.cc
@@ -499,7 +499,7 @@ aghui::SExpDesignUI::
show_changelog()
{
gtk_widget_show_all( (GtkWidget*)wAbout);
- gtk_notebook_set_current_page( cAboutTabs, 2);
+ gtk_notebook_set_current_page( cAboutTabs, 1);
}
--
Sleep experiment manager
More information about the debian-med-commit
mailing list