[med-svn] [aghermann] 05/05: prepare for 1.0.4
andrei zavada
hmmr-guest at moszumanska.debian.org
Sat May 2 19:54:13 UTC 2015
This is an automated email from the git hooks/post-receive script.
hmmr-guest pushed a commit to branch WIP
in repository aghermann.
commit 39371bbb32c51323d9ab2f6515abc3de3bc9d437
Author: Andrei Zavada <hmmr at ra>
Date: Fri Apr 10 01:53:13 2015 +0300
prepare for 1.0.4
---
debian/changelog | 6 +
debian/copyright | 2 +-
gentoo/aghermann-1.0.3.ebuild | 30 ++
gentoo/aghermann-1.0.4.ebuild | 30 ++
upstream/ChangeLog | 6 +
upstream/configure.ac | 4 +-
upstream/data/mw-dialogs.glade | 621 +++++++++++++++++++++--------------------
7 files changed, 391 insertions(+), 308 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 05a6add..74c8519 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+aghermann (1.0.4-1) experimental; urgency=low
+
+ * New upstream version (Closes: #777769).
+
+ -- Andrei Zavada <johnhommer at gmail.com> Fri, 10 Apr 2015 01:51:00 +0200
+
aghermann (1.0.3-1) experimental; urgency=low
* New upstream version.
diff --git a/debian/copyright b/debian/copyright
index 49c397c..8c7e950 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: Andrei Zavada <johnhommer at gmail.com>
Source: http://johnhommer.com/academic/code/aghermann/source/
Files: *
-Copyright: 2008-2014 Andrei Zavada <johnhommer at gmail.com>
+Copyright: 2008-2015 Andrei Zavada <johnhommer at gmail.com>
License: GPL-2+
Files: src/libsigproc/exstrom.hh
diff --git a/gentoo/aghermann-1.0.3.ebuild b/gentoo/aghermann-1.0.3.ebuild
new file mode 100644
index 0000000..58eaa8d
--- /dev/null
+++ b/gentoo/aghermann-1.0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+DESCRIPTION="A sleep-research experiment manager, EDF viewer & Achermann's Process S model runner"
+HOMEPAGE="http://johnhommer.com/academic/code/aghermann"
+SRC_URI="http://johnhommer.com/academic/code/aghermann/source/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/lua:*
+ dev-libs/libconfig
+ dev-libs/libunique:3
+ media-libs/libsamplerate
+ sci-libs/fftw:3.0
+ sci-libs/gsl
+ sci-libs/itpp
+ x11-libs/gtk+:3
+ x11-libs/vte:2.90"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ econf --bindir="${EPREFIX}"/bin
+}
diff --git a/gentoo/aghermann-1.0.4.ebuild b/gentoo/aghermann-1.0.4.ebuild
new file mode 100644
index 0000000..2e1b52a
--- /dev/null
+++ b/gentoo/aghermann-1.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+DESCRIPTION="A sleep-research experiment manager, EDF viewer & Achermann's Process S model runner"
+HOMEPAGE="http://johnhommer.com/academic/code/aghermann"
+SRC_URI="http://johnhommer.com/academic/code/aghermann/source/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/lua:*
+ dev-libs/libconfig
+ dev-libs/libunique:3
+ media-libs/libsamplerate
+ sci-libs/fftw:3.0
+ sci-libs/gsl
+ sci-libs/itpp
+ x11-libs/gtk+:3
+ x11-libs/vte:2.90"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ econf --bindir="${EPREFIX}"/usr/bin
+}
diff --git a/upstream/ChangeLog b/upstream/ChangeLog
index 14819eb..9bdc002 100644
--- a/upstream/ChangeLog
+++ b/upstream/ChangeLog
@@ -1,3 +1,9 @@
+v.1.0.4 (2015-04-10)
+ * Fix: Don't mess with screen resolution, restore fonts to normal
+ size.
+ * Fix: gcc-5 build.
+ * Misc: Minor UI tweaks.
+
v.1.0.3 (2015-02-03)
* Fix: Option to avoid using __DATE__ and __TIME__ (see
https://wiki.debian.org/ReproducibleBuilds/TimestampsFromCPPMacros).
diff --git a/upstream/configure.ac b/upstream/configure.ac
index 68a4c03..af545dc 100644
--- a/upstream/configure.ac
+++ b/upstream/configure.ac
@@ -1,6 +1,6 @@
-AC_COPYRIGHT([Copyright (c) 2008-14 Andrei Zavada <johnhommer at gmail.com>])
+AC_COPYRIGHT([Copyright (c) 2008-15 Andrei Zavada <johnhommer at gmail.com>])
-AC_INIT([Aghermann], [1.0.3], [johnhommer at gmail.com])
+AC_INIT([Aghermann], [1.0.4], [johnhommer at gmail.com])
AC_CONFIG_SRCDIR([src/aghermann/main.cc])
AC_CONFIG_MACRO_DIR([m4])
AC_PREREQ(2.61)
diff --git a/upstream/data/mw-dialogs.glade b/upstream/data/mw-dialogs.glade
index df5171f..0440a16 100644
--- a/upstream/data/mw-dialogs.glade
+++ b/upstream/data/mw-dialogs.glade
@@ -40,6 +40,48 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area11">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button1">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="bBatchRunExecute">
+ <property name="label">gtk-execute</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
@@ -358,48 +400,6 @@
<property name="position">1</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area11">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="button1">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="bBatchRunExecute">
- <property name="label">gtk-execute</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
</child>
<action-widgets>
@@ -1005,6 +1005,124 @@
<object class="GtkSizeGroup" id="sizegroup3"/>
<object class="GtkSizeGroup" id="sizegroup4"/>
<object class="GtkTextBuffer" id="tEDFFileDetailsReport"/>
+ <object class="GtkDialog" id="wEDFFileDetails">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">EEG source file details</property>
+ <property name="window_position">mouse</property>
+ <property name="destroy_with_parent">True</property>
+ <property name="icon">aghermann.png</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="skip_pager_hint">True</property>
+ <property name="gravity">north-east</property>
+ <signal name="close" handler="gtk_widget_hide" swapped="no"/>
+ <signal name="delete-event" handler="gtk_true" swapped="no"/>
+ <signal name="response" handler="gtk_widget_hide" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="bEDFFileDetailsDismiss">
+ <property name="label">_Dismiss</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="is_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">half</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="lEDFFileDetails">
+ <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>EEG source file 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>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkTextView" id="lEDFFileDetailsReport">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">5</property>
+ <property name="editable">False</property>
+ <property name="cursor_visible">False</property>
+ <property name="buffer">tEDFFileDetailsReport</property>
+ <property name="accepts_tab">False</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-5">bEDFFileDetailsDismiss</action-widget>
+ </action-widgets>
+ </object>
<object class="GtkDialog" id="wEdfImport">
<property name="width_request">500</property>
<property name="can_focus">False</property>
@@ -1487,7 +1605,7 @@
<property name="xalign">0</property>
<property name="xpad">5</property>
<property name="ypad">15</property>
- <property name="label"><b><big><big>Aghermann 1.0.2 </big></big></b>
+ <property name="label"><b><big><big>Aghermann 1.0.4 </big></big></b>
<a href="http://johnhommer.com/academic/code/aghermann">johnhommer.com/academic/code/aghermann</a></property>
<property name="use_markup">True</property>
</object>
@@ -1584,7 +1702,18 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<property name="yalign">0</property>
<property name="xpad">10</property>
<property name="ypad">10</property>
- <property name="label"><b>v. 1.0.2</b> (2014-10-14)
+ <property name="label"><b>v. 1.0.4</b> (2015-04-10)
+<span font="monospace" size="small">
+ * Fix: Don't mess with screen resolution, restore fonts to normal size.
+ * Fix: gcc-5 build.
+ * Misc: Minor UI tweaks.
+</span>
+<b>v. 1.0.3</b> (2015-02-03)
+<span font="monospace" size="small">
+ * Fix: Option to avoid using __DATE__ and __TIME__ (see
+ https://wiki.debian.org/ReproducibleBuilds/TimestampsFromCPPMacros).
+</span>
+<b>v. 1.0.2</b> (2014-10-14)
<span font="monospace" size="small">
* Fix: Get right desktop files and menu icons.
</span>
@@ -1670,47 +1799,50 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<action-widget response="0">button2</action-widget>
</action-widgets>
</object>
- <object class="GtkDialog" id="wEDFFileDetails">
+ <object class="GtkDialog" id="wGlobalAnnotations">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">EEG source file details</property>
- <property name="window_position">mouse</property>
+ <property name="border_width">10</property>
+ <property name="title" translatable="yes">Annotations</property>
+ <property name="modal">True</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="default_width">531</property>
+ <property name="default_height">434</property>
<property name="destroy_with_parent">True</property>
- <property name="icon">aghermann.png</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
- <property name="gravity">north-east</property>
<signal name="close" handler="gtk_widget_hide" swapped="no"/>
- <signal name="delete-event" handler="gtk_true" swapped="no"/>
<signal name="response" handler="gtk_widget_hide" swapped="no"/>
<child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox4">
- <property name="visible">True</property>
+ <object class="GtkBox" id="dialog-vbox8">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area4">
- <property name="visible">True</property>
+ <object class="GtkButtonBox" id="dialog-action_area8">
<property name="can_focus">False</property>
- <property name="layout_style">start</property>
+ <property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="bEDFFileDetailsDismiss">
- <property name="label">_Dismiss</property>
+ <object class="GtkButton" id="button6">
+ <property name="label" translatable="yes">_Dismiss</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="is_focus">True</property>
+ <property name="can_focus">False</property>
<property name="receives_default">True</property>
- <property name="relief">half</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
+ <property name="secondary">True</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -1720,17 +1852,17 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
</packing>
</child>
<child>
- <object class="GtkBox" id="box9">
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkLabel" id="lEDFFileDetails">
+ <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>EEG source file header</big></b></property>
+ <property name="label" translatable="yes"><b><big>Annotated regions</big></b></property>
<property name="use_markup">True</property>
</object>
<packing>
@@ -1740,7 +1872,7 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator11">
+ <object class="GtkSeparator" id="separator12">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -1752,20 +1884,22 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="width_request">445</property>
- <property name="height_request">295</property>
+ <object class="GtkScrolledWindow" id="scrolledwindow9">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkTextView" id="lEDFFileDetailsReport">
+ <object class="GtkTreeView" id="tvGlobalAnnotations">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="border_width">5</property>
- <property name="editable">False</property>
- <property name="cursor_visible">False</property>
- <property name="buffer">tEDFFileDetailsReport</property>
- <property name="accepts_tab">False</property>
+ <property name="hscroll_policy">natural</property>
+ <property name="vscroll_policy">natural</property>
+ <property name="search_column">3</property>
+ <property name="level_indentation">5</property>
+ <property name="enable_tree_lines">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
</object>
</child>
</object>
@@ -1775,6 +1909,24 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="eGlobalAnnotationsShowPhasicEvents">
+ <property name="label" translatable="yes">Show _phasic events</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</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">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">True</property>
@@ -1785,39 +1937,33 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
</object>
</child>
<action-widgets>
- <action-widget response="-5">bEDFFileDetailsDismiss</action-widget>
+ <action-widget response="-7">button6</action-widget>
</action-widgets>
</object>
- <object class="GtkDialog" id="wGlobalAnnotations">
+ <object class="GtkDialog" id="wGlobalArtifactDetection">
<property name="can_focus">False</property>
<property name="border_width">10</property>
- <property name="title" translatable="yes">Annotations</property>
- <property name="modal">True</property>
<property name="window_position">center-on-parent</property>
- <property name="default_width">531</property>
- <property name="default_height">434</property>
- <property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
<signal name="close" handler="gtk_widget_hide" swapped="no"/>
+ <signal name="damage-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
<signal name="response" handler="gtk_widget_hide" swapped="no"/>
<child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox8">
+ <object class="GtkBox" id="dialog-vbox14">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area8">
+ <object class="GtkButtonBox" id="dialog-action_area14">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="button6">
- <property name="label" translatable="yes">_Dismiss</property>
+ <object class="GtkButton" id="button7">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1827,121 +1973,43 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="label33">
+ <object class="GtkButton" id="bGlobalADClearAll">
+ <property name="label" translatable="yes">Clea_r all</property>
<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>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator12">
+ <object class="GtkButton" id="bGlobalADOK">
+ <property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</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">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="tvGlobalAnnotations">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscroll_policy">natural</property>
- <property name="vscroll_policy">natural</property>
- <property name="search_column">3</property>
- <property name="level_indentation">5</property>
- <property name="enable_tree_lines">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection1"/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="eGlobalAnnotationsShowPhasicEvents">
- <property name="label" translatable="yes">Show _phasic events</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</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">True</property>
- <property name="position">3</property>
- </packing>
- </child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
</packing>
</child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-7">button6</action-widget>
- </action-widgets>
- </object>
- <object class="GtkDialog" id="wGlobalArtifactDetection">
- <property name="can_focus">False</property>
- <property name="border_width">10</property>
- <property name="window_position">center-on-parent</property>
- <property name="type_hint">dialog</property>
- <signal name="close" handler="gtk_widget_hide" swapped="no"/>
- <signal name="damage-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
- <signal name="response" handler="gtk_widget_hide" swapped="no"/>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox14">
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
<child>
<object class="GtkBox" id="box6">
<property name="visible">True</property>
@@ -2061,15 +2129,35 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<property name="position">1</property>
</packing>
</child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button7</action-widget>
+ <action-widget response="1">bGlobalADClearAll</action-widget>
+ <action-widget response="-5">bGlobalADOK</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="wGlobalScore">
+ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <signal name="close" handler="gtk_widget_hide" swapped="no"/>
+ <signal name="response" handler="gtk_widget_hide" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox17">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
<child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area14">
+ <object class="GtkButtonBox" id="dialog-action_area17">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="button7">
+ <object class="GtkButton" id="button3">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -2081,10 +2169,10 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
</packing>
</child>
<child>
- <object class="GtkButton" id="bGlobalADClearAll">
+ <object class="GtkButton" id="bGlobalRKClearAll">
<property name="label" translatable="yes">Clea_r all</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
@@ -2095,10 +2183,10 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
</packing>
</child>
<child>
- <object class="GtkButton" id="bGlobalADOK">
+ <object class="GtkButton" id="bGlobalRKOK">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
@@ -2118,26 +2206,6 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<property name="position">2</property>
</packing>
</child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-6">button7</action-widget>
- <action-widget response="1">bGlobalADClearAll</action-widget>
- <action-widget response="-5">bGlobalADOK</action-widget>
- </action-widgets>
- </object>
- <object class="GtkDialog" id="wGlobalScore">
- <property name="can_focus">False</property>
- <property name="border_width">10</property>
- <property name="window_position">center-on-parent</property>
- <property name="type_hint">dialog</property>
- <signal name="close" handler="gtk_widget_hide" swapped="no"/>
- <signal name="response" handler="gtk_widget_hide" swapped="no"/>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox17">
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
@@ -2257,12 +2325,33 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<property name="position">1</property>
</packing>
</child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button3</action-widget>
+ <action-widget response="1">bGlobalRKClearAll</action-widget>
+ <action-widget response="-5">bGlobalRKOK</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="wMontageDefaults">
+ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <signal name="close" handler="gtk_widget_hide" swapped="no"/>
+ <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
+ <signal name="response" handler="gtk_widget_hide" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox12">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
<child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area17">
+ <object class="GtkButtonBox" id="dialog-action_area12">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="button3">
+ <object class="GtkButton" id="button5">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2273,11 +2362,10 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
- <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="bGlobalRKClearAll">
+ <object class="GtkButton" id="bGlobalMontageClearAll">
<property name="label" translatable="yes">Clea_r all</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2291,7 +2379,7 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
</packing>
</child>
<child>
- <object class="GtkButton" id="bGlobalRKOK">
+ <object class="GtkButton" id="bGlobalMontageOK">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2314,27 +2402,6 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<property name="position">2</property>
</packing>
</child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-6">button3</action-widget>
- <action-widget response="1">bGlobalRKClearAll</action-widget>
- <action-widget response="-5">bGlobalRKOK</action-widget>
- </action-widgets>
- </object>
- <object class="GtkDialog" id="wMontageDefaults">
- <property name="can_focus">False</property>
- <property name="border_width">10</property>
- <property name="window_position">center-on-parent</property>
- <property name="type_hint">dialog</property>
- <signal name="close" handler="gtk_widget_hide" swapped="no"/>
- <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
- <signal name="response" handler="gtk_widget_hide" swapped="no"/>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox12">
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
<child>
<object class="GtkBox" id="box5">
<property name="visible">True</property>
@@ -2508,62 +2575,6 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<property name="position">1</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area12">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="button5">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="bGlobalMontageClearAll">
- <property name="label" translatable="yes">Clea_r all</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="bGlobalMontageOK">
- <property name="label">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
</child>
<action-widgets>
@@ -2592,21 +2603,6 @@ 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>Tree scan report</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>
@@ -2635,6 +2631,21 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
</packing>
</child>
<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>Tree scan report</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="separator13">
<property name="visible">True</property>
<property name="can_focus">False</property>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git
More information about the debian-med-commit
mailing list